Merge version 5.11.2+dfsg-3+rpi1 and 5.11.2+dfsg-4 to produce 5.11.2+dfsg-4+rpi1

diff --cc debian/changelog
index ddd0094d48e62a6b34edead9e39fcbf273303635,1fd57da9ec229e63e912dad8ad35212039ec1ac6..f2b3e9890b866eca6a56afb357d9448873939afd
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,22 +1,32 @@@
- qtbase-opensource-src (5.11.2+dfsg-3+rpi1) buster-staging; urgency=medium
++qtbase-opensource-src (5.11.2+dfsg-4+rpi1) buster-staging; urgency=medium
 +
 +  [changes introduced in 5.6.1+dfsg-2+rpi1] by Peter Michael Green]
 +  * Partially fix clean target.
 +
 +  [changes introduced in 5.9.1+dfsg-9+rpi1 by Peter Michael Green]
 +  * Disable neon (-no-neon no longer seems to work, so edit configure.json instead)
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 25 Oct 2018 04:50:32 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 04 Nov 2018 12:08:16 +0000
++
+ qtbase-opensource-src (5.11.2+dfsg-4) unstable; urgency=medium
+ 
+   * Mark libvulkan-dev build-dependency as linux-any (closes: #911422).
+     Thanks to Samuel Thibault for the initial patch.
+   * Move all QtVulkanSupport headers to qtbase5-private-dev package.
+     The static library is there, so the headers should also be there.
+   * Sort debian/qtbase5-dev.install using wrap-and-sort.
+   * Make qtbase5-dev depend on libvulkan-dev on linux, as Qt headers
+     include Vulkan headers.
+   * Add a patch to pass default include directories to qdoc.
+   * Bump qttools build-dependency to 5.11.2-4 (to get unpatched qdoc).
+   * Drop Revert-QWidgetWindow-Immediately-forward-close-event.patch.
+     The issue was fixed in kxmlgui v5.49.0, no need to patch Qt anymore.
+   * Replace hidpi_scale_at_192.diff with a version that has been applied
+     upstream (reference_dpi.diff).
+   * Backport upstream patch to fix freezes when opening applications
+     (dont_get_screen_rotation.diff).
+ 
+  -- Dmitry Shachnev <mitya57@debian.org>  Mon, 29 Oct 2018 22:59:29 +0300
  
  qtbase-opensource-src (5.11.2+dfsg-3) unstable; urgency=medium
  

diff --cc debian/patches/series
index 6b7adae977cf1cabe124e469367ada2ab0afb7e6,e20be01d71ee7f159740068c7ae7c8d997dff7c7..349f53984210293b6c3eb9cdded534119c61c4ca
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -13,5 -13,4 +13,5 @@@ armv4.dif
  nonlinux_utime.diff
  no_arc4random_buf.diff
  ssl_max_version.diff
- Revert-QWidgetWindow-Immediately-forward-close-event.patch
+ qdoc_default_incdirs.diff
 +modify-configure.json-to-disable-neon.patch